Skip to content

Conversation

@novegit
Copy link
Contributor

@novegit novegit commented Jul 29, 2020

description for and-combination of rewrite_tag filter rules
PR: fluent/fluent-bit#2399

Signed-off-by: Michael Voelker [email protected]

description for and-combination for rewrite_tag filter rules
PR: fluent/fluent-bit#2399

Signed-off-by: Michael Voelker <[email protected]>
@edsiper
Copy link
Member

edsiper commented Dec 13, 2021

note: waiting for resolution on fluent/fluent-bit#2399

@edsiper edsiper added the waiting-for-user Waiting for user/contributors feedback or requested changes label Dec 13, 2021
@lecaros lecaros requested review from a team as code owners March 25, 2025 14:34
@eschabell
Copy link
Collaborator

@novegit can you please resolve the conflicts in this docs PR?

@eschabell eschabell self-assigned this Oct 21, 2025
@eschabell eschabell added the conflict Waiting on conflict to be resolved by contributor label Oct 21, 2025
@esmerel
Copy link
Contributor

esmerel commented Oct 21, 2025

I corrected the conflict because it was due to format changes we made for consistency.

Copy link
Contributor

@esmerel esmerel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stylistic suggestion updates for consistency.

@esmerel esmerel removed the conflict Waiting on conflict to be resolved by contributor label Oct 21, 2025
Copy link
Contributor

@esmerel esmerel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correcting a couple more issues, including one i made.

@esmerel
Copy link
Contributor

esmerel commented Oct 21, 2025

@eschabell The vale failure isn't spurious but it isn't related to this PR - I've corrected several things in this PR for stylistic issues so if it's technically correct then I'm ok with it.

@patrick-stephens
Copy link
Contributor

Why is it failing? Is it fixed elsewhere?

@esmerel
Copy link
Contributor

esmerel commented Oct 21, 2025

Why is it failing? Is it fixed elsewhere?

Yep, the PR you approved a few minutes ago corrects most of the things. There may still be spelling, I didn't fix all of those.

@patrick-stephens patrick-stephens merged commit 21a43f7 into fluent:master Oct 21, 2025
6 of 7 checks passed
@eschabell
Copy link
Collaborator

This doc PR is dependent on this code PR fluent/fluent-bit#2399 being merged, but it's still open @patrick-stephens so not sure if it's in there until code merge?

@eschabell eschabell added question and removed waiting-for-user Waiting for user/contributors feedback or requested changes labels Oct 21, 2025
@patrick-stephens
Copy link
Contributor

patrick-stephens commented Oct 22, 2025

Ah yes, I must have missed that. Will need to revert and reopen this one

TomlinfreeGit pushed a commit to TomlinfreeGit/fluent-bit-docs that referenced this pull request Oct 28, 2025
* filter_rewrite_tag: add and-combination for rules

description for and-combination for rewrite_tag filter rules
PR: fluent/fluent-bit#2399

Signed-off-by: Michael Voelker <[email protected]>

* Apply suggestions from code review

Signed-off-by: Lynette  Miles <[email protected]>

* Apply suggestions from code review

Signed-off-by: Lynette  Miles <[email protected]>

---------

Signed-off-by: Michael Voelker <[email protected]>
Signed-off-by: Lynette  Miles <[email protected]>
Co-authored-by: Lynette  Miles <[email protected]>
Signed-off-by: Tom <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants